Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20019] Add Autofill port to TCP Transport (backport #4061) #4104

Merged
merged 2 commits into from
Dec 12, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 5, 2023

This is an automatic backport of pull request #4061 done by Mergify.
Cherry-pick of 36f31dd has failed:

On branch mergify/bp/2.6.x/pr-4061
Your branch is up to date with 'origin/2.6.x'.

You are currently cherry-picking commit 36f31dd53.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	modified:   src/cpp/rtps/transport/TCPTransportInterface.h
	modified:   src/cpp/rtps/transport/TCPv4Transport.cpp
	modified:   src/cpp/rtps/transport/TCPv6Transport.cpp
	modified:   test/unittest/transport/TCPv4Tests.cpp
	modified:   test/unittest/transport/TCPv6Tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/transport/TCPAcceptor.cpp
	both modified:   test/blackbox/CMakeLists.txt
	both modified:   test/blackbox/common/BlackboxTestsTransportTCP.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Refs #20019: Blackbox Test

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20019: Unittest autofill port

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20019: TCP Autofill port

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

Rearrange update of port

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20019: Uncrustify

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20019: Add static_cast conversion

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20019: Apply revision changes

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 36f31dd)

# Conflicts:
#	src/cpp/rtps/transport/TCPAcceptor.cpp
#	test/blackbox/CMakeLists.txt
#	test/blackbox/common/BlackboxTestsTransportTCP.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Dec 5, 2023
@mergify mergify bot mentioned this pull request Dec 5, 2023
13 tasks
@cferreiragonz cferreiragonz added this to the v2.6.7 milestone Dec 5, 2023
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Dec 5, 2023
@MiguelCompany
Copy link
Member

@richiprosima please test this

@EduPonz EduPonz merged commit 7989348 into 2.6.x Dec 12, 2023
12 of 14 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4061 branch December 12, 2023 06:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants